From 1c9483c9b2676fbc1547889f23bae9ccd453166e Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 7 Apr 2024 09:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=20-=20=E9=A2=9D=E5=BA=A6=E6=98=BE=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=BC=98=E5=8C=96=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=A2=9D?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A5=E6=BA=90=E6=98=8E=E7=BB=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/exchange/integral/index.vue  | 16 ++++++++++------
 src/views/marketing/exchange/quota/index.vue     |  4 ++++
 src/views/marketing/exchange/quota/oil.vue       |  4 ++++
 src/views/marketing/exchange/quota/vegetable.vue |  4 ++++
 src/views/marketing/exchange/quota/wine.vue      |  4 ++++
 src/views/user/member/inviteCode.vue             |  2 +-
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/views/marketing/exchange/integral/index.vue b/src/views/marketing/exchange/integral/index.vue
index a5e5acd..24a9fad 100644
--- a/src/views/marketing/exchange/integral/index.vue
+++ b/src/views/marketing/exchange/integral/index.vue
@@ -60,22 +60,23 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="变更前数量" prop="change_front" min-width="120" align="center"/>
-            <el-table-column label="变更数量" prop="change_quantity" min-width="120" align="center"/>
-            <el-table-column label="变更类型" min-width="120" align="center">
+            <el-table-column label="变更前数量" prop="change_front" min-width="80" align="center"/>
+            <el-table-column label="变更数量" prop="change_quantity" min-width="80" align="center"/>
+            <el-table-column label="变更类型" min-width="80" align="center">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.change_type == 1" type="success" effect="dark">增加</el-tag>
                 <el-tag v-else type="danger" effect="dark">减少</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="变更后数量" prop="change_after" min-width="120" align="center"/>
-            <el-table-column label="积分类型" min-width="120" align="center">
+            <el-table-column label="变更后数量" prop="change_after" min-width="80" align="center"/>
+            <el-table-column label="积分类型" min-width="80" align="center">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.source == 1" type="warning" effect="dark">预支积分</el-tag>
                 <el-tag v-else type="info" effect="dark">积分</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="变更时间" prop="create_time" min-width="120" align="center"/>
+            <el-table-column label="变更时间" prop="create_time" min-width="130" align="center"/>
+            <el-table-column label="备注" prop="remark" min-width="150" align="center"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -179,6 +180,9 @@ export default {
 .selWidth {
   width: 350px !important;
 }
+/deep/ .cell{
+  padding: 0!important;
+}
 .seachTiele {
   line-height: 35px;
 }
diff --git a/src/views/marketing/exchange/quota/index.vue b/src/views/marketing/exchange/quota/index.vue
index 05dce73..dae61c9 100644
--- a/src/views/marketing/exchange/quota/index.vue
+++ b/src/views/marketing/exchange/quota/index.vue
@@ -71,6 +71,7 @@
             </el-table-column>
             <el-table-column label="变更后数量" prop="change_after" min-width="120" align="center"/>
             <el-table-column label="变更时间" prop="create_time" min-width="120" align="center"/>
+            <el-table-column label="备注" prop="remark" min-width="120" align="center"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -167,6 +168,9 @@ export default {
 .selWidth {
   width: 350px !important;
 }
+/deep/ .cell{
+  padding: 0!important;
+}
 .seachTiele {
   line-height: 35px;
 }
diff --git a/src/views/marketing/exchange/quota/oil.vue b/src/views/marketing/exchange/quota/oil.vue
index e030b14..b50df93 100644
--- a/src/views/marketing/exchange/quota/oil.vue
+++ b/src/views/marketing/exchange/quota/oil.vue
@@ -71,6 +71,7 @@
             </el-table-column>
             <el-table-column label="变更后数量" prop="change_after" min-width="120" align="center"/>
             <el-table-column label="变更时间" prop="create_time" min-width="120" align="center"/>
+            <el-table-column label="备注" prop="remark" min-width="120" align="center"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -168,6 +169,9 @@ export default {
 .selWidth {
   width: 350px !important;
 }
+/deep/ .cell{
+  padding: 0!important;
+}
 .seachTiele {
   line-height: 35px;
 }
diff --git a/src/views/marketing/exchange/quota/vegetable.vue b/src/views/marketing/exchange/quota/vegetable.vue
index 39b0b2e..7258474 100644
--- a/src/views/marketing/exchange/quota/vegetable.vue
+++ b/src/views/marketing/exchange/quota/vegetable.vue
@@ -71,6 +71,7 @@
             </el-table-column>
             <el-table-column label="变更后数量" prop="change_after" min-width="120" align="center"/>
             <el-table-column label="变更时间" prop="create_time" min-width="120" align="center"/>
+            <el-table-column label="备注" prop="remark" min-width="120" align="center"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -168,6 +169,9 @@ export default {
 .selWidth {
   width: 350px !important;
 }
+/deep/ .cell{
+  padding: 0!important;
+}
 .seachTiele {
   line-height: 35px;
 }
diff --git a/src/views/marketing/exchange/quota/wine.vue b/src/views/marketing/exchange/quota/wine.vue
index 41dbd91..3943fea 100644
--- a/src/views/marketing/exchange/quota/wine.vue
+++ b/src/views/marketing/exchange/quota/wine.vue
@@ -71,6 +71,7 @@
             </el-table-column>
             <el-table-column label="变更后数量" prop="change_after" min-width="120" align="center"/>
             <el-table-column label="变更时间" prop="create_time" min-width="120" align="center"/>
+            <el-table-column label="备注" prop="remark" min-width="120" align="center"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -168,6 +169,9 @@ export default {
 .selWidth {
   width: 350px !important;
 }
+/deep/ .cell{
+  padding: 0!important;
+}
 .seachTiele {
   line-height: 35px;
 }
diff --git a/src/views/user/member/inviteCode.vue b/src/views/user/member/inviteCode.vue
index 21ee118..89b8046 100644
--- a/src/views/user/member/inviteCode.vue
+++ b/src/views/user/member/inviteCode.vue
@@ -52,7 +52,7 @@
             激活时间 / 使用时间
           </template>
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status == 0" type="info">{{ scope.row.mer_id > 0 ? '待激活' : '待分配'  }}</el-tag>
+            <el-tag v-if="scope.row.status == 0" type="info">待激活</el-tag>
             <template v-else-if="scope.row.status == 1">
               <el-tag type="primary">
                 已激活<br />