From 101d67ad4836a2609c7a5b326f3af9281b8eb6f6 Mon Sep 17 00:00:00 2001
From: yanran200830 <yanran200830@163.com>
Date: Tue, 29 Nov 2022 15:55:17 +0800
Subject: [PATCH] bug

---
 project/pidu/app/AppGoods/components/Add.vue  | 18 +++++++++--
 project/pidu/app/AppGoods/components/List.vue |  4 +++
 project/pidu/app/AppOrder/components/List.vue | 32 +++++++++++++++----
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/Add.vue b/project/pidu/app/AppGoods/components/Add.vue
index 7559fae1..d3f1184c 100644
--- a/project/pidu/app/AppGoods/components/Add.vue
+++ b/project/pidu/app/AppGoods/components/Add.vue
@@ -49,8 +49,8 @@
                 <div class="AppAnnounceDetail-select">
                   <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
                   <div class="select-left" v-if="form.rangeList.length">
-                    <span v-for="(item, index) in form.girdList" :key="index" v-if="index < 9">{{ item.girdName }}</span>
-                    <em v-if="form.girdList.length > 9">等{{ form.girdList.length }}个</em>
+                    <span v-for="(item, index) in girdList" :key="index" v-if="index < 9">{{ item.girdName }}</span>
+                    <em v-if="girdList.length > 9">等{{ girdList.length }}个</em>
                   </div>
                   <i v-if="!form.rangeList.length">请选择</i>
                   <div class="select-right">{{ form.rangeList.length ? '重新选择' : '选择' }}</div>
@@ -114,12 +114,24 @@
             this.form.imageUrl = [{
               url: res.data.imageUrl
             }]
+
+            if (res.data.rangeList && res.data.rangeList.length) {
+              this.form.wxGroupsName = 1
+              this.girdList = res.data.rangeList.map(v => {
+                return {
+                  ...v,
+                  id: v.rangeId,
+                  girdName: v.rangeName
+                }
+              })
+              this.form.rangeList = res.data.rangeList.map(v => v.rangeId)
+            }
           }
         })
       },
 
       onPick (e) {
-        this.form.girdList = e
+        this.girdList = e
       },
 
       onSelcetChange (e) {
diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index 2a20e3d9..b0a91e8b 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -163,6 +163,10 @@
         })
       },
 
+      onUserChange () {
+        
+      },
+
       mapStatus (status) {
         return {
           '0': '可兑换',
diff --git a/project/pidu/app/AppOrder/components/List.vue b/project/pidu/app/AppOrder/components/List.vue
index d971f3ef..f40282be 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" v-model="user">
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false">
             <div class="userSelcet">
               <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
               <span v-else>兑换人</span>
@@ -20,7 +20,7 @@
             v-model="search.source"
             clearable
             placeholder="请选择订单状态"
-            :selectList="dict.getDict('EP_source')"
+            :selectList="dict.getDict('merchandiseStatus')"
             @change="search.current = 1, getList()">
           </ai-select>
           <el-date-picker
@@ -74,6 +74,8 @@
         <el-table-column slot="goods" width="240px" label="商品" align="left">
           <template slot-scope="{ row }">
             <div class="goods">
+              <img :src="row.imageUrl">
+              <span>{{ row.merchandiseName }}</span>
             </div>
           </template>
         </el-table-column>
@@ -107,6 +109,7 @@
           name: '',
           createUserId: ''
         },
+        user: [],
         name: '',
         info: {},
         colConfigs: [
@@ -120,9 +123,10 @@
             label: '兑换时间'
           },
           {
-            prop: 'arriveAreaName',
+            prop: 'status',
             align: 'center',
-            label: '状态'
+            label: '状态',
+            formart: v => this.dict.getLabel('merchandiseStatus', v)
           }
         ],
         ids: [],
@@ -134,14 +138,18 @@
     },
 
     created () {
-      this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
+      this.dict.load(['merchandiseStatus']).then(() => {
         this.getList()
       })
     },
 
     methods: {
+      onUserChange () {
+        
+      },
+
       getList () {
-        this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
+        this.instance.post(`/app/appintegralmerchandiseorder/list`, null, {
           params: {
             ...this.search,
             arriveAreaId: this.search.arriveAreaId,
@@ -150,6 +158,7 @@
           }
         }).then(res => {
           if (res.code == 0) {
+            console.log(res.data.records)
             this.tableData = res.data.records
             this.total = res.data.total
           }
@@ -181,6 +190,17 @@
 
 <style scoped lang="scss">
   .list {
+    .goods {
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 80px;
+        height: 80px;
+        margin-right: 20px;
+      }
+    }
+
     .userSelcet {
       display: flex;
       align-items: center;