From 7d06b718bffc45c248ac6b051d53d0b6eb9d861e Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Fri, 8 Dec 2023 16:16:52 +0800
Subject: [PATCH] 1

---
 gasStation-uni/pages/index/index.vue          |  15 +-
 .../RechargeRecords/RechargeRecords.vue       |  69 ++++
 .../pagesHome/oilRecharge/oilRecharge.vue     | 364 +++++++++---------
 3 files changed, 265 insertions(+), 183 deletions(-)
 create mode 100644 gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue

diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 0a6a80d64..acc49d624 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -201,7 +201,7 @@
 			getUserAuthority() {
 				let _this = this;
 				// this.getAddress();
-				
+
 				wx.getSetting({
 					success(res) {
 						if (!res.authSetting['scope.userLocation']) {
@@ -234,8 +234,8 @@
 				}).then((response) => {
 					_this.store = response.data
 					let welfare = response.data.welfare
-					uni.setStorageSync("storeId",response.data.id)
-					uni.setStorageSync("chainStoreId",response.data.chainStoreId)
+					uni.setStorageSync("storeId", response.data.id)
+					uni.setStorageSync("chainStoreId", response.data.chainStoreId)
 					if (welfare != undefined && welfare != null && welfare != "") {
 						if (welfare.includes(",")) {
 							_this.welfare = response.data.welfare.split(",")
@@ -271,7 +271,7 @@
 							_this.distance = (Math.ceil(response.data.distance)).toFixed(1)
 							_this.store = response.data.store
 							uni.setStorageSync("storeId", response.data.store.id)
-							uni.setStorageSync("chainStoreId",response.data.store.chainStoreId)
+							uni.setStorageSync("chainStoreId", response.data.store.chainStoreId)
 							let welfare = response.data.store.welfare
 							if (welfare != undefined && welfare != null && welfare != "") {
 								if (welfare.includes(",")) {
@@ -281,15 +281,16 @@
 								}
 							}
 						})
-						
+
 						uni.showToast({
-							title:"获取位置信息成功"
+							title: "获取位置信息成功",
+							icon: "none"
 						})
 					},
 					fail: function(err) {
 						_this.getStore(2);
 						uni.showToast({
-							title:"获取位置信息失败"
+							title: "获取位置信息失败"
 						})
 						console.log('获取位置信息失败: ' + err.errMsg);
 					}
diff --git a/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue b/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue
new file mode 100644
index 000000000..54773dfc6
--- /dev/null
+++ b/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="content">
+		<view class="container">
+			<view class="my-header">
+				<view class="my-icons" @click="goback"> <uni-icons type="left" size="16"></uni-icons> </view>
+				<view class="my-text">充值记录</view>
+				<view class="my-icons"></view>
+			</view>
+			<!-- 顶部区域 -->
+
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: '',
+
+
+			}
+		},
+
+		components: {
+
+		},
+		methods: {
+			goback() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		background: #f4f5f6;
+	}
+
+	.container {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+		padding-top: 88px;
+	}
+
+	.my-header {
+		width: 100%;
+		height: 88px;
+		background: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #000;
+		box-sizing: border-box;
+		padding: 0px 15px;
+		padding-top: 40px;
+
+		.my-icons {
+			width: 20px;
+
+		}
+
+		position: fixed;
+		top: 0px;
+	}
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index 1014215fb..4591bebf4 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -32,128 +32,129 @@
 						{{index+1}}.{{item || "" }}
 					</view>
 				</view>
+				<view class="box-gang" @click="show = true">
+					<view class="">推荐员工</view>
+					<view class=""></view>
+					<view class="">
+						<uni-icons type="right" size="14"></uni-icons>
+					</view>
+
+					<!-- 底部 -->
+
+				</view>
+				<view class="bottom-box">
+					<view class="anniu">
+						<text>立即充值</text>
+					</view>
+					<view class="dibu" @click="goRechargeRecords()">
+						<view class="">充值记录</view>
+						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
+					</view>
+
+					<view class="box-hui">
+						<view style="margin-bottom: 15px;">服务说明</view>
+						<view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
+						<view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
+					</view>
+				</view>
+
+			</view>
+			<!-- 囤油充值 -->
+			<view class="boxback" v-if="actinput == 1">
+				<view class="box-cz">
+					<view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardFuleList"
+						:key="index" @click="fuleindex(index,item.rechargeBalance,item.points)">
+						<view class="s-title" :class="{ 'actsize' : actindex == index }">油品:{{item.type}}
+						</view>
+						<view class="s-title" :class="{ 'actsize' : actindex == index }">油号:{{item.oilType}}
+						</view>
+						<view class="min-size" :class="{ 'actsize' : actindex == index }">单价￥<text
+								style="font-weight: bold;"></text>{{item.incomeLitres}}元/升</view>
+						<view class="min-size" :class="{ 'actsize' : actindex == index }">总价￥{{item.rechargeBalance}}元
+						</view>
+						<view class="min-size" :class="{ 'actsize' : actindex == index }">升数:{{item.incomeLitres}}L
+						</view>
+
+
+					</view>
+				</view>
+				<view class="box-hui">
+					<view style="margin-bottom: 15px;">充值{{text}}元权益</view>
+					<view class="huisize" v-for="(item,index) in shuomingFList" :key="index">
+						{{index+1}}.{{item || "" }}
+					</view>
+				</view>
 				<view class="box-gang">
 					<view class="">推荐员工</view>
 					<view class=""></view>
 					<view class="" @click="show = true">
 						<uni-icons type="right" size="14"></uni-icons>
 					</view>
-
-          <!-- 底部 -->
-
 				</view>
-        <view class="bottom-box">
-          <view class="anniu">
-            <text>立即充值</text>
-          </view>
-          <view class="dibu">
-            <view class="">充值记录</view>
-            <uni-icons type="right" color="#1678ff" size="14"></uni-icons>
-          </view>
 
-          <view class="box-hui">
-            <view style="margin-bottom: 15px;">服务说明</view>
-            <view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
-            <view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
-          </view>
-        </view>
+				<!-- 底部 -->
+				<view class="bottom-box">
+					<view class="anniu">
+						<text>立即充值</text>
+					</view>
+					<view class="dibu" @click="goRechargeRecords()">
+						<view class="">充值记录</view>
+						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
+					</view>
 
+					<view class="box-hui">
+						<view style="margin-bottom: 15px;">服务说明</view>
+						<view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
+						<view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
+					</view>
+				</view>
 			</view>
-			<!-- 囤油充值 -->
-      <view class="boxback" v-if="actinput == 1">
-        <view class="box-cz">
-          <view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardFuleList"
-                :key="index"
-                @click="fuleindex(index,item.rechargeBalance,item.points)">
-            <view class="s-title" :class="{ 'actsize' : actindex == index }">油品:{{item.type}}
-            </view>
-            <view class="s-title" :class="{ 'actsize' : actindex == index }">油号:{{item.oilType}}
-            </view>
-            <view class="min-size" :class="{ 'actsize' : actindex == index }">单价￥<text
-                style="font-weight: bold;"></text>{{item.incomeLitres}}元/升</view>
-            <view class="min-size" :class="{ 'actsize' : actindex == index }">总价￥{{item.rechargeBalance}}元
-            </view>
-            <view class="min-size" :class="{ 'actsize' : actindex == index }">升数:{{item.incomeLitres}}L
-            </view>
-
-
-          </view>
-        </view>
-        <view class="box-hui">
-          <view style="margin-bottom: 15px;">充值{{text}}元权益</view>
-          <view class="huisize" v-for="(item,index) in shuomingFList" :key="index">
-            {{index+1}}.{{item || "" }}
-          </view>
-        </view>
-        <view class="box-gang">
-          <view class="">推荐员工</view>
-          <view class=""></view>
-          <view class="" @click="show = true">
-            <uni-icons type="right" size="14"></uni-icons>
-          </view>
-        </view>
-
-        <!-- 底部 -->
-        <view class="bottom-box">
-          <view class="anniu">
-            <text>立即充值</text>
-          </view>
-          <view class="dibu">
-            <view class="">充值记录</view>
-            <uni-icons type="right" color="#1678ff" size="14"></uni-icons>
-          </view>
-
-          <view class="box-hui">
-            <view style="margin-bottom: 15px;">服务说明</view>
-            <view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
-            <view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
-          </view>
-        </view>
-      </view>
 			<!-- 礼品兑换 -->
 			<view class="boxback" style="box-sizing: border-box; padding: 1px; " v-if="actinput == 2 ">
 				<view class="inputbox">
 					<view class="cadname">卡号</view>
-					 	<input type="text"  v-model="number" placeholder="请输入礼品卡卡号" />
+					<input type="text" v-model="number" placeholder="请输入礼品卡卡号" />
 				</view>
 				<view class="inputbox">
-					<view class="cadname" >卡密</view>
-					 	<input type="text" v-model="cardPassword" placeholder="请输入礼品卡卡密" />
+					<view class="cadname">卡密</view>
+					<input type="text" v-model="cardPassword" placeholder="请输入礼品卡卡密" />
 				</view>
-        <view class="bottom-box" >
-          <view class="anniu" @click="exchangeGift()">
-            <text>立即兑换</text>
-          </view>
-          <view class="dibu">
-            <view class="">兑换记录</view>
-            <uni-icons type="right" color="#1678ff" size="14"></uni-icons>
-          </view>
+				<view class="bottom-box">
+					<view class="anniu" @click="exchangeGift()">
+						<text>立即兑换</text>
+					</view>
+					<view class="dibu" @click="goRechargeRecords()">
+						<view class="">兑换记录</view>
+						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
+					</view>
 
-          <view class="box-hui">
-            <view style="margin-bottom: 15px;">服务说明</view>
-            <view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
-            <view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
-          </view>
-        </view>
+					<view class="box-hui">
+						<view style="margin-bottom: 15px;">服务说明</view>
+						<view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
+						<view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
+					</view>
+				</view>
 			</view>
 
-			<u-picker :show="show" :columns="columns" @confirm="confirm" @cancel="cancel"></u-picker>
-      <u-modal :show="shows" :title="message" :content='money' @confirm="confirms()" ></u-modal>
+			<u-picker :show="show" :columns="columns" keyName="realName" @confirm="confirm" @cancel="cancel"></u-picker>
+			<u-modal :show="shows" :title="message" :content='money' @confirm="confirms()"></u-modal>
 		</view>
 	</view>
 </template>
 
 <script>
 	import request from '../../utils/request'
-  import {getValue} from "@dcloudio/uni-ui/lib/uni-forms/utils";
+	import {
+		getValue
+	} from "@dcloudio/uni-ui/lib/uni-forms/utils";
 	export default {
 		data() {
 			return {
-        shows:false,
-			  money:'',
-			  message:'',
-        number:'',
-        cardPassword:'',
+				shows: false,
+				money: '',
+				message: '',
+				number: '',
+				cardPassword: '',
 				title: '',
 				actindex: 0,
 				actInput: 0,
@@ -161,11 +162,11 @@
 				text: "",
 				fringeBenefit: "",
 				giftBalance: "",
-        rechargeBalance: "",
-        incomeLitres: "",
-        lockupPrice: "",
-        type: "",
-        oilType: "",
+				rechargeBalance: "",
+				incomeLitres: "",
+				lockupPrice: "",
+				type: "",
+				oilType: "",
 				points: "",
 				growthValue: "",
 				show: false,
@@ -194,13 +195,15 @@
 		},
 		onShow() {
 			this.getValueCars();
+			this.getStaffList()
 			//this.getFuelCars();
 		},
 		methods: {
-      confirms(){
-        this.shows = false
-      },
+			confirms() {
+				this.shows = false
+			},
 			confirm(e) {
+				console.log(e);
 				this.show = false
 			},
 			cancel() {
@@ -226,30 +229,30 @@
 				}
 				this.actindex = index
 			},
-    fuleindex(index, text, points,) {
-      this.shuomingFList = []
-      console.log(this.shuomingFList);
-      if (text) {
-        this.text = text
-      }
-      if (points) {
-        this.shuomingFList.push('赠送' + points + '积分')
-      }
-      this.actindex = index
-    },
+			fuleindex(index, text, points, ) {
+				this.shuomingFList = []
+				console.log(this.shuomingFList);
+				if (text) {
+					this.text = text
+				}
+				if (points) {
+					this.shuomingFList.push('赠送' + points + '积分')
+				}
+				this.actindex = index
+			},
 			getindex(index) {
 				this.actinput = index
-        if (index==0){
-          this.getValueCars();
-        }
-        if (index==1){
-          this.getFuelCars();
-        }
+				if (index == 0) {
+					this.getValueCars();
+				}
+				if (index == 1) {
+					this.getFuelCars();
+				}
 			},
 			goback() {
 				uni.navigateBack()
 			},
-      //储值卡
+			//储值卡
 			getValueCars() {
 				request({
 					url: 'business/marketingActivity/cardValue',
@@ -268,60 +271,69 @@
 
 				})
 			},
-  //囤油卡
-  getFuelCars() {
-    request({
-      url: 'business/marketingActivity/cardFuelDiesel',
-      method: 'get',
-      data: {
-        activeStatus: '1'
-      },
-    }).then(res => {
-      this.cardValueList = []
-      if (res.code == 200) {
-        this.cardFuleList = res.data.records
-        this.fuleindex(0, this.cardValueList[0].rechargeBalance, this.cardValueList[0].fringeBenefit,
-            this.cardFuleList[0].rechargeBalance, this.cardFuleList[0].points, this
-                .cardFuleList[0].lockupPrice, this
-                .cardFuleList[0].incomeLitres)
-      }
-    })
-  },
-      //礼品卡兑换
-      exchangeGift(){
-			  request({
-          url:'/business/marketingActivity/cardGift/exchange?number='+this.number+"&cardPassword="+this.cardPassword,
-          method:'get',
-        }).then(res=>{
-          if (res.data.id == '' || res.data.id == null){
-            this.shows = true
-            this.message = '兑换失败！',
-            this.money = ''
-          }else {
-            this.shows = true
-            this.message = '兑换成功！',
-            this.money = res.data.cardAmount+'元'
-          }
-        })
-      },
-      //礼品卡兑换记录
-      getGiftRecords(){
-        request({
-          url:'/business/marketingActivity/cardGift/selectAllRecords',
-          method:'get',
-        }).then(res=>{
-          console.log(res)
-        })
-      },
-      //获取本店员工列表
-      getStaffList(){
-        request({
-          url:'/business/member/staff/list',
-          method:'get',
-        }).then(res=>{
-         this.columns = res.data.records
-        })
-      }
+			//囤油卡
+			getFuelCars() {
+				request({
+					url: 'business/marketingActivity/cardFuelDiesel',
+					method: 'get',
+					data: {
+						activeStatus: '1'
+					},
+				}).then(res => {
+					this.cardValueList = []
+					if (res.code == 200) {
+						this.cardFuleList = res.data.records
+						this.fuleindex(0, this.cardValueList[0].rechargeBalance, this.cardValueList[0]
+							.fringeBenefit,
+							this.cardFuleList[0].rechargeBalance, this.cardFuleList[0].points, this
+							.cardFuleList[0].lockupPrice, this
+							.cardFuleList[0].incomeLitres)
+					}
+				})
+			},
+			//礼品卡兑换
+			exchangeGift() {
+				request({
+					url: '/business/marketingActivity/cardGift/exchange?number=' + this.number + "&cardPassword=" +
+						this.cardPassword,
+					method: 'get',
+				}).then(res => {
+					if (res.data.id == '' || res.data.id == null) {
+						this.shows = true
+						this.message = '兑换失败！',
+							this.money = ''
+					} else {
+						this.shows = true
+						this.message = '兑换成功！',
+							this.money = res.data.cardAmount + '元'
+					}
+				})
+			},
+			//礼品卡兑换记录
+			getGiftRecords() {
+				request({
+					url: '/business/marketingActivity/cardGift/selectAllRecords',
+					method: 'get',
+				}).then(res => {
+					console.log(res)
+				})
+			},
+			goRechargeRecords() {
+				uni.navigateTo({
+					url: '/pagesMy/Recharge/Recharge'
+				})
+			},
+			//获取本店员工列表
+			getStaffList() {
+				request({
+					url: '/business/member/staff/list',
+					method: 'get',
+				}).then(res => {
+					this.columns.push(res.data.records)
+					console.log("columns", this.columns);
+
+				})
+			}
 		}
 	}
 </script>
@@ -454,8 +466,8 @@
 	.s-title {
 		width: 100%;
 		text-align: center;
-    font-size: 12px;
-    font-weight: bold;
+		font-size: 12px;
+		font-weight: bold;
 	}
 
 	.min-size {
@@ -501,4 +513,4 @@
 		width: 20%;
 
 	}
-</style>
+</style>
\ No newline at end of file