From cadeccf2f80264a0b5ea70fb1494022449d929fb 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, 1 Dec 2023 16:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=A8=E5=80=BC=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/EventMarketing/SaveBlock/index.vue  |  4 +-
 gasStation-uni/pagesHome/activeIn/index.vue   |  2 +-
 .../pagesHome/oilRecharge/oilRecharge.vue     | 49 ++++++++++++++++---
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index 14844fd42..2de5b4a10 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -208,13 +208,13 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="14">
+<!--              <el-col :span="14">
                 <el-form-item label="赠送加油金" :label-width="formLabelWidth" prop="refuelMoney">
                   <el-input type="number" v-model="form.refuelMoney" autocomplete="off">
                     <template slot="append">元</template>
                   </el-input>
                 </el-form-item>
-              </el-col>
+              </el-col>-->
             </el-row>
 
             <el-form-item label="赠送特权" :label-width="formLabelWidth" prop="resource">
diff --git a/gasStation-uni/pagesHome/activeIn/index.vue b/gasStation-uni/pagesHome/activeIn/index.vue
index 6bb48c303..7a55305b5 100644
--- a/gasStation-uni/pagesHome/activeIn/index.vue
+++ b/gasStation-uni/pagesHome/activeIn/index.vue
@@ -28,7 +28,7 @@
 		components: {
 
 		},
-		onLoad() {
+		onShow() {
 			this.getData();
 		},
 		methods: {
diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index 24f8c3787..14f4c3e9e 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -17,17 +17,22 @@
 			<!-- 储值充值 -->
 			<view class="boxback" v-if="actinput == 0 || actinput == 1  ">
 				<view class="box-cz">
-					<view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in 5"
-						:key="index" @click="xzindex(index)">
+					<view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardValueList"
+						:key="index"
+						@click="xzindex(index,item.rechargeBalance,item.fringeBenefit,item.giftBalance,item.points,item.growthValue)">
 						<view class="s-title" :class="{ 'actsize' : actindex == index }">￥ <text
-								style="font-weight: bold;">0.01</text> </view>
-						<view class="min-size" :class="{ 'actsize' : actindex == index }">售价￥0.01</view>
+								style="font-weight: bold;"></text>{{item.rechargeBalance}}</view>
+						<view class="min-size" :class="{ 'actsize' : actindex == index }">售价￥{{item.rechargeBalance}}
+						</view>
 					</view>
 				</view>
 				<view class="box-hui">
-					<view style="margin-bottom: 15px;">充值权益</view>
-					<view class="huisize">1.该服务为储蓄卡直充服务</view>
-					<view class="huisize">2.请确认充值类型正确后再付款 </view>
+					<view style="margin-bottom: 15px;">充值{{text}}元权益</view>
+					<view class="huisize" v-if="fringeBenefit">{{1}}.{{fringeBenefit}}</view>
+					<view class="huisize" v-if="giftBalance">{{2}}.赠送金额{{giftBalance}}</view>
+					<view class="huisize" v-if="points">{{3}}.赠送积分{{points}}</view>
+					<view class="huisize" v-if="growthValue">{{4}}.赠送成长值{{growthValue}}</view>
+					<!-- <view class="huisize" v-if="fringeBenefit">{{index + 1}}.{{fringeBenefit}}</view> -->
 				</view>
 				<view class="box-gang">
 					<view class="">推荐员工</view>
@@ -75,11 +80,19 @@
 </template>
 
 <script>
+	import request from '../../utils/request'
 	export default {
 		data() {
 			return {
 				title: '',
 				actindex: 0,
+				actInput: 0,
+				index: 0,
+				text: "",
+				fringeBenefit: "",
+				giftBalance: "",
+				points: "",
+				growthValue: "",
 				show: false,
 				columns: [
 					['员工一', '员工二', '员工三']
@@ -95,12 +108,16 @@
 					},
 
 				],
+				cardValueList: [],
 
 				actinput: 0,
 			}
 		},
 		components: {
 
+		},
+		onShow() {
+			this.getValueCars();
 		},
 		methods: {
 			confirm(e) {
@@ -109,14 +126,30 @@
 			cancel() {
 				this.show = false
 			},
-			xzindex(index) {
+			xzindex(index, text, fringeBenefit, giftBalance, points, growthValue) {
 				this.actindex = index
+				this.text = text
+				this.fringeBenefit = fringeBenefit
+				this.giftBalance = giftBalance
+				this.points = points
+				this.growthValue = growthValue
 			},
 			getindex(index) {
 				this.actinput = index
 			},
 			goback() {
 				uni.navigateBack()
+			},
+			getValueCars() {
+				request({
+					url: '/business/marketingActivity/cardValue',
+					method: 'get',
+					data: {
+						activeStatus: '1'
+					},
+				}).then(res => {
+					this.cardValueList = res.data.records
+				})
 			}
 		}
 	}