From 4da5f8ee50e6a7547f1a5babad173fbafb4d922a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Fri, 15 Mar 2024 10:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activeConsumption/index.vue               | 28 +++++++++-------
 .../EventMarketing/activeNewlyweds/index.vue  | 22 ++++++++-----
 .../EventMarketing/activeRecommend/index.vue  | 32 +++++++++++--------
 .../EventMarketing/cardExchange/index.vue     |  4 +--
 4 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 4d339ee9f..77b1ea9a3 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -234,9 +234,8 @@
                   label="券类型"
                   width="80">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.giftCardType == 0" >油品券</span>
-                    <span v-if="scope.row.giftCardType == 1"  >商品券</span>
-                    <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                    <span v-if="scope.row.giftCardType == 0" >满减券</span>
+                    <span v-if="scope.row.giftCardType == 1"  >折扣券</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -304,9 +303,8 @@
                 label="券类型"
                 width="80">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >油品券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >商品券</span>
-                  <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                  <span v-if="scope.row.giftCardType == 0" >商品券</span>
+                  <span v-if="scope.row.giftCardType == 1"  >洗车券</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -504,9 +502,8 @@
           label="券类型"
           >
           <template slot-scope="scope">
-            <span v-if="scope.row.type == 0" >油品券</span>
-            <span v-if="scope.row.type == 1"  >商品券</span>
-            <span v-if="scope.row.type == 2"  >通用券</span>
+            <span v-if="scope.row.discountType == 0" >满减券</span>
+            <span v-if="scope.row.discountType == 1"  >折扣券</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -570,9 +567,16 @@
           label="券类型"
          >
           <template slot-scope="scope">
-            <span v-if="scope.row.type == 0" >油品券</span>
-            <span v-if="scope.row.type == 1"  >商品券</span>
-            <span v-if="scope.row.type == 2"  >通用券</span>
+            <span v-if="scope.row.type == 0" >商品券</span>
+            <span v-if="scope.row.type == 1"  >洗车券</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          label="券详情"
+          width="80">
+          <template slot-scope="scope">
+            <span>{{scope.row.cardDetail}}</span>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index fef3d8d03..af9ddddd9 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -96,9 +96,8 @@
                 label="券类型"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >油品券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >商品券</span>
-                  <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                  <span v-if="scope.row.giftCardType == 0" >满减券</span>
+                  <span v-if="scope.row.giftCardType == 1"  >折扣券</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -165,8 +164,8 @@
                 label="券类型"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >洗车券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >商品券</span>
+                  <span v-if="scope.row.giftCardType == 0" >商品券</span>
+                  <span v-if="scope.row.giftCardType == 1"  >洗车券</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -351,9 +350,8 @@
           label="券类型"
       >
           <template slot-scope="scope">
-            <span v-if="scope.row.type == 0" >油品券</span>
-            <span v-if="scope.row.type == 1"  >商品券</span>
-            <span v-if="scope.row.type == 2"  >通用券</span>
+            <span v-if="scope.row.discountType == 0" >满减券</span>
+            <span v-if="scope.row.discountType == 1"  >折扣券</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -419,6 +417,14 @@
             <span v-if="scope.row.type == 1"  >商品券</span>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="date"
+          label="券详情"
+          width="80">
+          <template slot-scope="scope">
+            <span>{{scope.row.cardDetail}}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="date"
           label="使用说明"
diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
index d76210edb..71879c0a0 100644
--- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
@@ -169,7 +169,7 @@
         </el-form-item>
 <!--        优惠券-->
         <div class="xh-box"  v-if="ruleForm.inviterGiftType && ruleForm.inviterGiftType.indexOf('0')>-1"  >
-          <div class="box-bt"> <div >赠送卡券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button>  </div>
+          <div class="box-bt"> <div >选择优惠券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button>  </div>
           <div style="margin: 10px 0px">
             <el-table
               :data="ruleForm.ylist"
@@ -185,9 +185,8 @@
                 label="券类型"
                >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >油品券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >商品券</span>
-                  <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                  <span v-if="scope.row.giftCardType == 0" >满减券</span>
+                  <span v-if="scope.row.giftCardType == 1"  >折扣券</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -255,9 +254,8 @@
                 label="券类型"
                 >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >油品券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >商品券</span>
-                  <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                  <span v-if="scope.row.giftCardType == 0" >商品券</span>
+                  <span v-if="scope.row.giftCardType == 1"  >洗车券</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -514,10 +512,9 @@
           label="券类型"
          >
           <template slot-scope="scope">
-            <span v-if="scope.row.type == 0" >油品券</span>
-            <span v-if="scope.row.type == 1"  >商品券</span>
-            <span v-if="scope.row.type == 2"  >通用券</span>
-          </template>
+          <span v-if="scope.row.discountType == 0" >满减券</span>
+          <span v-if="scope.row.discountType == 1"  >折扣券</span>
+        </template>
         </el-table-column>
         <el-table-column
           prop="date"
@@ -578,9 +575,16 @@
           label="券类型"
           >
           <template slot-scope="scope">
-            <span v-if="scope.row.type == 0" >油品券</span>
-            <span v-if="scope.row.type == 1"  >商品券</span>
-            <span v-if="scope.row.type == 2"  >通用券</span>
+            <span v-if="scope.row.type == 0" >商品券</span>
+            <span v-if="scope.row.type == 1"  >洗车券</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          label="券详情"
+          width="80">
+          <template slot-scope="scope">
+            <span>{{scope.row.cardDetail}}</span>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index e306603ea..6807b0c01 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -196,11 +196,11 @@
           <el-input-number  :min="1" placeholder="请输入卡券有效期" v-model="form.validity">
             <template slot="append">天</template>
           </el-input-number>
-          <div style="width: 217px">
+<!--          <div style="width: 217px">
             <el-input type="number" placeholder="请输入卡券有效期" v-model="form.validity">
               <template slot="append">天</template>
             </el-input>
-          </div>
+          </div>-->
 
         </el-form-item>
         <el-form-item label="使用说明" prop="useInstructions">