From b4ae677932b80b8ec8adfac654f52cdf25e9a890 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 13:48:26 +0800
Subject: [PATCH 1/4] bug

---
 project/pidu/app/AppGoods/components/List.vue    |  5 +++++
 .../AppGridMemberScore/components/ApplyList.vue  | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index 5e0271da..d87ea59a 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -105,6 +105,11 @@
             label: '可见范围',
             formart: v => v === '0' ? '不限' : '指定网格'
           },
+          {
+            prop: 'arriveTime',
+            align: 'center',
+            label: '上架时间'
+          },
           {
             prop: 'status',
             align: 'center',
diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
index 3adbdaa7..5fecbc1c 100644
--- a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -103,13 +103,15 @@
               this.getList()
             }
           })
-        }).catch(() => {
-          this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=2`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('审核拒绝成功')
-              this.getList()
-            }
-          })
+        }).catch(action => {
+          if (action === 'cancel') {
+            this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=2`).then(res => {
+              if (res.code == 0) {
+                this.$message.success('审核拒绝成功')
+                this.getList()
+              }
+            })
+          }
         })
       }
     }

From 57107ae4ade98d9f5723858adddbf7fe6c927271 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 13:59:17 +0800
Subject: [PATCH 2/4] 31161

---
 project/pidu/app/AppGoods/components/List.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index d87ea59a..cda37b81 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -48,11 +48,11 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="goods" width="240px" label="商品" align="left">
+        <el-table-column slot="goods" width="280px" label="商品" align="left">
           <template slot-scope="{ row }">
             <div class="goods">
               <img :src="row.imageUrl">
-              <span>{{ row.merchandiseName }}</span>
+              <span :title="row.merchandiseName">{{ row.merchandiseName }}</span>
             </div>
           </template>
         </el-table-column>
@@ -206,6 +206,14 @@
         height: 80px;
         margin-right: 20px;
       }
+
+      span {
+        flex: 1;
+        display: -webkit-box;
+        overflow: hidden;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+      }
     }
 
     .userSelcet {

From 394975f4d519f868f294c87bda366f3c04c5eee4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 14:00:34 +0800
Subject: [PATCH 3/4] 31157

---
 project/pidu/app/AppGoods/components/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index cda37b81..02896a98 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -182,7 +182,7 @@
       },
 
       remove (id) {
-        this.$confirm('确定删除该数据？').then(() => {
+        this.$confirm('删除后，商品将不可恢复，是否继续？').then(() => {
           this.instance.post(`/app/appintegralmerchandise/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')

From 78e9e20a5db64e789105623287ef471330b5c5f2 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 14:03:03 +0800
Subject: [PATCH 4/4] 31159

---
 project/pidu/app/AppGoods/components/List.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index 02896a98..a5af66ed 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -92,12 +92,13 @@
         info: {},
         colConfigs: [
           { slot: 'goods', label: '商品' },
-          { prop: 'merchandiseIntegral', align: 'center', label: '单价' },
-          { prop: 'merchandiseNumber', align: 'center', label: '数量' },
+          { prop: 'merchandiseIntegral', align: 'center', label: '单价', sortable: true },
+          { prop: 'merchandiseNumber', align: 'center', label: '数量', sortable: true },
           {
             prop: 'arriveTime',
             align: 'center',
-            label: '兑换量'
+            label: '兑换量',
+            sortable: true
           },
           {
             prop: 'visibleRange',