From 7de4b95679cf2ac9ebd24104fc106d639b73c37e 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: Sat, 13 Jan 2024 09:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventMarketing/activeNewlyweds/index.vue  |  4 ++--
 .../EventMarketing/activeRecommend/index.vue  |  8 +++----
 .../EventMarketing/cardFavorable/index.vue    |  3 +++
 .../views/EventMarketing/giftBlock/index.vue  |  3 +--
 .../EventMarketing/storeOilBlock/index.vue    | 21 ++++++++++++++++---
 gasStation-uni/pagesMy/Coupons/Coupons.vue    |  2 +-
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index ddf295d2c..3c08d97d7 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -476,7 +476,7 @@
           label="券详情"
           width="100">
           <template slot-scope="scope">
-            <span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>
+            <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -847,7 +847,7 @@ export default {
         validityZero: row.validityZero,
         validityOne: row.validityOne,
         validityTwo:row.validityTwo,
-        giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
+        giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
         giftCardTime: "", //券有效期
         giftCardTotal: 1//券数量
       }
diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
index ddedee9b9..8c04e7099 100644
--- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
@@ -324,7 +324,7 @@
           label="券详情"
           width="100">
           <template slot-scope="scope">
-            <span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>
+            <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -388,7 +388,7 @@
           label="券详情"
           width="100">
           <template slot-scope="scope">
-            <span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>
+            <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -752,7 +752,7 @@ export default {
         validityZero: row.validityZero,
         validityOne: row.validityOne,
         validityTwo:row.validityTwo,
-        giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
+        giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
         giftCardTime: "", //券有效期
         giftCardTotal: 1//券数量
       }
@@ -782,7 +782,7 @@ export default {
         validityZero: row.validityZero,
         validityOne: row.validityOne,
         validityTwo:row.validityTwo,
-        giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
+        giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
         giftCardTime: "", //券有效期
         giftCardTotal: 1//券数量
       }
diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index bd279912d..0db1a4639 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -418,6 +418,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        timeType: [
+          { required: true, message: '不能为空', trigger: 'change' }
+        ],
         chainStorId: [
           { required: true, message: '不能为空', trigger: 'change' }
         ],
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index ef6e7eeb3..7c683dd70 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -3,8 +3,7 @@
 <!--      礼品卡-->
       <el-card  style="margin-bottom: 20px">
         <div class="top-hang">
-        <el-input v-model="queryParams.number"  style="width: 20%;margin-right: 10px" placeholder="礼品卡号  "></el-input>
-        <el-input v-model="queryParams.remark" style="width: 20%;margin-right: 10px" placeholder="备注信息"></el-input>
+        <el-input v-model="queryParams.number"  clearable style="width: 20%;margin-right: 10px" placeholder="礼品卡号  "></el-input>
         <el-select v-model="queryParams.activateStatus" style="margin-right: 10px" placeholder="请选择">
           <el-option
             v-for="item in option"
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 050b544e9..a09a0cee7 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -2,7 +2,7 @@
     <div class="app-container">
 <!--      存油卡-->
       <el-card  style="margin-bottom: 20px">
-        <el-radio-group v-model="queryParams.type" @input="radiovalue">
+        <el-radio-group v-model="queryParams.type" @input="radiovalue(dict.label)">
           <el-radio-button v-for="dict in dict.type.oil_type"
                            :key="dict.value"
                            :label="dict.label"
@@ -300,6 +300,13 @@
           pageNo:1,
           pageSize:10,
         },
+        queryParamss:{
+          type:'',
+          oilType:'',
+          activeStatus:'',
+          pageNo:1,
+          pageSize:10,
+        },
         rules:{
           oilType: [
             { required: true, message: '不能为空', trigger: 'blur' },
@@ -361,13 +368,21 @@
 
     methods:{
       //
-      radiovalue(){
-
+      radiovalue(lable){
+        /*this.queryParamss.type = lable;
+        console.log("222222222222"+queryParamss)
+          getList(this.queryParamss).then(res=>{
+            if(res.code == 200){
+              this.tableData = res.data.records
+              this.total = res.data.total;
+            }
+          })*/
         this.oilList = []
         oilName(this.queryParams.type).then(res=>{
           this.oilList = res.data.records
           console.log('我的油站' ,res)
         })
+
       },
       getlist(){
         this.queryParams.pageNo=this.pageNo
diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue
index ce675fab5..d1e913864 100644
--- a/gasStation-uni/pagesMy/Coupons/Coupons.vue
+++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue
@@ -177,7 +177,7 @@
 			},
 			goRecharge(id, cardRecordId) {
 				uni.navigateTo({
-					url: '/pagesHome/oilRecharge/oilRecharge?id=0&cardFavorableId=' + id +
+					url: '/pages/refuel/refuel?id=0&cardFavorableId=' + id +
 						'&cardRecordId=' +
 						cardRecordId
 				})